Merge v1.21 into v2.1 #1746
Merged
Merge v1.21 into v2.1 #1746
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ollections with autoEncryption enabled (#1745) * PHPLIB-1702: Always consult server encryptedFieldsMap when dropping collections * Bump tests/drivers-evergreen-tools to a332144 Necessary to fix PyMongo compat with MongoDB 4.0 * Detect metadata collections only when auto encryption is enabled on the client * Bump tests/specifications to 0aee4aa Necessary to fix change stream tests for server 8.2+ --------- Co-authored-by: Jérôme Tamarelle <[email protected]>
GromNaN
requested review from
jmikola and
GromNaN
and removed request for
paulinevos
jmikola
approved these changes
Aug 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge new changes from v1.21 into v2.1.
Commits
autoEncryptionenabled #1745): 75eb24a
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.1 and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.